Skip to content

Enable file locking in musl stdio - #15065

Merged
sbc100 merged 1 commit into
mainfrom
musl_threaded
Sep 20, 2021
Merged

Enable file locking in musl stdio#15065
sbc100 merged 1 commit into
mainfrom
musl_threaded

Conversation

@sbc100

@sbc100 sbc100 commented Sep 17, 2021

Copy link
Copy Markdown
Collaborator

This is second attempt at landing a version of
d5d5f69

The first time we tried it #13837 we ran into issues with
test_pthread_exit_process deadlocking which I tracked down to an issue
with system/lib/libc/musl/src/thread/__wait.c where it was blocking
the main thread forever rather then looping and calling
emscripten_main_thread_process_queued_calls.

Includes a version of #14481 so that should land before this does.

Fixes: #13194

@sbc100
sbc100 requested review from kleisauke and kripken and removed request for kripken September 17, 2021 17:10
@kleisauke

Copy link
Copy Markdown
Collaborator

Looks like the test failure in wasm3.test_pthread_abort (https://circleci.com/gh/emscripten-core/emscripten/455648) is the same as the one reported in #15014.

@kleisauke kleisauke left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for keeping track of this! This looks good to me.

Comment thread system/lib/pthread/pthread_create.c Outdated
@kripken

kripken commented Sep 17, 2021

Copy link
Copy Markdown
Member

Includes a version of #14481 so that should land before this does.

If you also need my review, perhaps this PR could target that other PR? Then I'd just see the diff between them. (As I'm not familiar with the other PR, it would be hard for me to just review the new parts here, and I don't see an easy way on github to get that diff.) But @kleisauke 's review is probably enough already?

This is second attempt at landing a version of
d5d5f69

The first time we tried it #13837 we ran into issues with
test_pthread_exit_process deadlocking which I tracked down to an issue
with `system/lib/libc/musl/src/thread/__wait.c` where it was blocking
the main thread forever rather then looping and calling
`emscripten_main_thread_process_queued_calls`.

Includes a version of #14481 so that should land before this does.

Fixes: #13194
@sbc100
sbc100 enabled auto-merge (squash) September 20, 2021 20:41
@sbc100
sbc100 merged commit fdd486f into main Sep 20, 2021
@sbc100
sbc100 deleted the musl_threaded branch September 20, 2021 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fprintf is non-thread-safe

3 participants